From 58824aa9bb80cdd9a4f27968781ec73406e878a4 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Thu, 30 Jun 2005 19:07:16 +0000 Subject: [PATCH] Clarify the code, gcc 4 complains about predecrement in MAX(). 2005-06-30 Matthias Clasen * gtk/gtktreemodelfilter.c (gtk_tree_model_filter_fetch_child): Clarify the code, gcc 4 complains about predecrement in MAX(). --- ChangeLog | 3 +++ ChangeLog.pre-2-10 | 3 +++ ChangeLog.pre-2-8 | 3 +++ gtk/gtktreemodelfilter.c | 5 ++++- 4 files changed, 13 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 1c7b2030dc..385763a09e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2005-06-30 Matthias Clasen + * gtk/gtktreemodelfilter.c (gtk_tree_model_filter_fetch_child): + Clarify the code, gcc 4 complains about predecrement in MAX(). + * modules/input/gtkimcontextxim.c (gtk_im_context_xim_finalize): Don't prematurely unregister callbacks. diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 1c7b2030dc..385763a09e 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,5 +1,8 @@ 2005-06-30 Matthias Clasen + * gtk/gtktreemodelfilter.c (gtk_tree_model_filter_fetch_child): + Clarify the code, gcc 4 complains about predecrement in MAX(). + * modules/input/gtkimcontextxim.c (gtk_im_context_xim_finalize): Don't prematurely unregister callbacks. diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 1c7b2030dc..385763a09e 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,5 +1,8 @@ 2005-06-30 Matthias Clasen + * gtk/gtktreemodelfilter.c (gtk_tree_model_filter_fetch_child): + Clarify the code, gcc 4 complains about predecrement in MAX(). + * modules/input/gtkimcontextxim.c (gtk_im_context_xim_finalize): Don't prematurely unregister callbacks. diff --git a/gtk/gtktreemodelfilter.c b/gtk/gtktreemodelfilter.c index ca68253c2a..d786d55fa9 100644 --- a/gtk/gtktreemodelfilter.c +++ b/gtk/gtktreemodelfilter.c @@ -827,7 +827,10 @@ gtk_tree_model_filter_fetch_child (GtkTreeModelFilter *filter, g_array_insert_val (level->array, i, elt); *index = i; - for (i = MAX (--i, 0); i < level->array->len; i++) + if (i > 0) + i--; + + for ( ; i < level->array->len; i++) { FilterElt *e = &(g_array_index (level->array, FilterElt, i)); if (e->children) -- 2.30.2